A11yStatus: fix resetting the GTK and icon themes

If the Shell is started with HighContrast enabled, it will never
see another value for the GSettings keys. In that case, we just
reset to the default.

https://bugzilla.gnome.org/show_bug.cgi?id=642641

diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index b5b6cdbe1eeb76b5ee63d0c339e3c4508b6f324d..af503706fb0964b40fdcf7aa87d5d28d27334bbc 100644 (file)
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -168,9 +168,12 @@ ATIndicator.prototype = {
                 if (enabled) {
                     settings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
                     settings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
-                } else {
+                } else if(!hasHC) {
                     settings.set_string(KEY_GTK_THEME, gtkTheme);
                     settings.set_string(KEY_ICON_THEME, iconTheme);
+                } else {
+                    settings.reset(KEY_GTK_THEME);
+                    settings.reset(KEY_ICON_THEME);
                 }
             });
         settings.connect('changed::' + KEY_GTK_THEME, function() {